merge trunk

diff --cc src/ChangeLog
index fa0e9f6a20b465ed312842e35d2c9efe01478456,8631f0f5b4cab2345954e0a8f7905a5895f7e8ff..ffe3e0f2bb1714f2feb502852a760a97ea298b3f
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,9 +1,13 @@@
 -2013-04-26  Paul Eggert  <eggert@cs.ucla.edu>
 +2013-04-27  Kenichi Handa  <handa@gnu.org>
 +
 +      * font.c (font_open_entity): Always open a font of manageable
 +      size.
  
++2013-04-26  Paul Eggert  <eggert@cs.ucla.edu>
+       Port better to AIX (Bug#14258).
+       * lisp.h (ENUM_BF) [__IBMC__]: Make it 'unsigned int' here, too,
+       to pacify AIX xlc.
+ 
  2013-04-24  Kenichi Handa  <handa@gnu.org>
  
        * coding.c (decode_coding_iso_2022): When an invalid escape